projects
/
project
/
bcm63xx
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
89c9784
)
powerpc: c29xpcie: Do not wrap pci_eth_init() with CONFIG_TSEC_ENET
author
Bin Meng
<
[email protected]
>
Tue, 12 Jan 2016 06:41:13 +0000
(22:41 -0800)
committer
Joe Hershberger
<
[email protected]
>
Thu, 28 Jan 2016 18:22:30 +0000
(12:22 -0600)
The call to pci_eth_init() should not be wrapped with CONFIG_TSEC_ENET.
Signed-off-by: Bin Meng <
[email protected]
>
Acked-by: Joe Hershberger <
[email protected]
>
board/freescale/c29xpcie/c29xpcie.c
patch
|
blob
|
history
diff --git
a/board/freescale/c29xpcie/c29xpcie.c
b/board/freescale/c29xpcie/c29xpcie.c
index f42d373dafbbb5f6fbb57239bec8a073e204c0e4..e325b4db4af9362fbe41dbedb24f07b00348a8af 100644
(file)
--- a/
board/freescale/c29xpcie/c29xpcie.c
+++ b/
board/freescale/c29xpcie/c29xpcie.c
@@
-83,9
+83,9
@@
void pci_init_board(void)
}
#endif /* ifdef CONFIG_PCI */
-#ifdef CONFIG_TSEC_ENET
int board_eth_init(bd_t *bis)
{
+#ifdef CONFIG_TSEC_ENET
struct fsl_pq_mdio_info mdio_info;
struct tsec_info_struct tsec_info[2];
int num = 0;
@@
-110,10
+110,10
@@
int board_eth_init(bd_t *bis)
fsl_pq_mdio_init(bis, &mdio_info);
tsec_eth_init(bis, tsec_info, num);
+#endif
return pci_eth_init(bis);
}
-#endif
#if defined(CONFIG_OF_BOARD_SETUP)
void fdt_del_sec(void *blob, int offset)